From 0aca394a96a4e61c2537412f68e42f75b7b6fa13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Mon, 8 Jan 2018 17:37:35 +0100 Subject: [PATCH] adwaita: Uncomment accidentally commented lines The result looks wrong but the css looks right. --- gtk/theme/Adwaita/_common.scss | 4 ++-- gtk/theme/Adwaita/gtk-contained-dark.css | 8 ++++++++ gtk/theme/Adwaita/gtk-contained.css | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 9216431d1c..92541d0cdb 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -3038,8 +3038,8 @@ scale { (top, left, right), (bottom, right, left) { &.#{$marks_class} { - //margin-#{$marks_margin}: $_marks_distance; - //margin-#{$marks_pos}: -($_marks_distance + $_marks_length); + margin-#{$marks_margin}: $_marks_distance; + margin-#{$marks_pos}: -($_marks_distance + $_marks_length); } } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 2360ccd0b4..ddb023f058 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1267,6 +1267,14 @@ scale value { color: alpha(currentColor,0.55); } scale marks { color: alpha(currentColor,0.55); } +scale marks.top { margin-bottom: 6px; margin-top: -12px; } + +scale marks.bottom { margin-top: 6px; margin-bottom: -12px; } + +scale marks.top { margin-right: 6px; margin-left: -12px; } + +scale marks.bottom { margin-left: 6px; margin-right: -12px; } + scale.fine-tune marks.top { margin-bottom: 6px; margin-top: -9px; } scale.fine-tune marks.bottom { margin-top: 6px; margin-bottom: -9px; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index d5faa4444e..b8dc1b3ef4 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1287,6 +1287,14 @@ scale value { color: alpha(currentColor,0.55); } scale marks { color: alpha(currentColor,0.55); } +scale marks.top { margin-bottom: 6px; margin-top: -12px; } + +scale marks.bottom { margin-top: 6px; margin-bottom: -12px; } + +scale marks.top { margin-right: 6px; margin-left: -12px; } + +scale marks.bottom { margin-left: 6px; margin-right: -12px; } + scale.fine-tune marks.top { margin-bottom: 6px; margin-top: -9px; } scale.fine-tune marks.bottom { margin-top: 6px; margin-bottom: -9px; } -- 2.30.2